Skip to content

fix Miri #60780

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 2 commits into from
May 14, 2019
Merged

fix Miri #60780

merged 2 commits into from
May 14, 2019

Conversation

RalfJung
Copy link
Member

This reverts #60156, which turned out to be a dead end (see #60469).

r? @oli-obk

@rust-highfive
Copy link
Contributor

⚠️ Warning ⚠️

  • These commits modify submodules.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 13, 2019
@oli-obk
Copy link
Contributor

oli-obk commented May 13, 2019

@bors r+ p=1

@bors
Copy link
Collaborator

bors commented May 13, 2019

📌 Commit b835ee53a981c01e7c0aee3b88430b0d969fdd0f has been approved by oli-obk

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 13, 2019
@RalfJung
Copy link
Member Author

Force-pushed to include the fix needed for #60401.

@RalfJung
Copy link
Member Author

@bors r=oli-obk

@bors
Copy link
Collaborator

bors commented May 13, 2019

📌 Commit 0d68836a28e0eec3ad0c48bfa3f00431c78bcd97 has been approved by oli-obk

@bors
Copy link
Collaborator

bors commented May 13, 2019

⌛ Testing commit 0d68836a28e0eec3ad0c48bfa3f00431c78bcd97 with merge d38c01b17fc1ddae41bf8edc169b4aad4af5af06...

@rust-highfive

This comment has been minimized.

Sign in to view
@RalfJung
Copy link
Member Author

Dang, we ran into some of @nnethercote's symbol changes. I'll have to figure out what we have to do in Miri there.

[01:34:34] �[0m�[1m�[38;5;9merror[E0308]�[0m�[0m�[1m: mismatched types�[0m
[01:34:34] �[0m   �[0m�[0m�[1m�[38;5;12m--> �[0m�[0msrc/tools/miri/src/lib.rs:481:74�[0m
[01:34:34] �[0m    �[0m�[0m�[1m�[38;5;12m|�[0m
[01:34:34] �[0m�[1m�[38;5;12m481�[0m�[0m �[0m�[0m�[1m�[38;5;12m| �[0m�[0m        let link_name = match attr::first_attr_value_str_by_name(&attrs, "link_name") {�[0m
[01:34:34] �[0m    �[0m�[0m�[1m�[38;5;12m| �[0m�[0m                                                                         �[0m�[0m�[1m�[38;5;9m^^^^^^^^^^^�[0m�[0m �[0m�[0m�[1m�[38;5;9mexpected struct `syntax::ast::Name`, found reference�[0m
[01:34:34] �[0m    �[0m�[0m�[1m�[38;5;12m|�[0m
[01:34:34] �[0m    �[0m�[0m�[1m�[38;5;12m= �[0m�[0m�[1mnote�[0m�[0m: expected type `�[0m�[0m�[1msyntax::ast::Name�[0m�[0m`�[0m
[01:34:34] �[0m               found type `�[0m�[0m�[1m&'static str�[0m�[0m`�[0m
[01:34:34] 
[01:34:34] �[0m�[1m�[38;5;9merror[E0308]�[0m�[0m�[1m: mismatched types�[0m
[01:34:34] �[0m   �[0m�[0m�[1m�[38;5;12m--> �[0m�[0msrc/tools/miri/src/fn_call.rs:144:74�[0m
[01:34:34] �[0m    �[0m�[0m�[1m�[38;5;12m|�[0m
[01:34:34] �[0m�[1m�[38;5;12m144�[0m�[0m �[0m�[0m�[1m�[38;5;12m| �[0m�[0m        let link_name = match attr::first_attr_value_str_by_name(&attrs, "link_name") {�[0m
[01:34:34] �[0m    �[0m�[0m�[1m�[38;5;12m| �[0m�[0m                                                                         �[0m�[0m�[1m�[38;5;9m^^^^^^^^^^^�[0m�[0m �[0m�[0m�[1m�[38;5;9mexpected struct `syntax::ast::Name`, found reference�[0m
[01:34:34] �[0m    �[0m�[0m�[1m�[38;5;12m|�[0m
[01:34:34] �[0m    �[0m�[0m�[1m�[38;5;12m= �[0m�[0m�[1mnote�[0m�[0m: expected type `�[0m�[0m�[1msyntax::ast::Name�[0m�[0m`�[0m
[01:34:34] �[0m               found type `�[0m�[0m�[1m&'static str�[0m�[0m`�[0m
[01:34:34] 
[01:34:35] �[0m�[1m�[38;5;9merror[E0308]�[0m�[0m�[1m: mismatched types�[0m
[01:34:35] �[0m  �[0m�[0m�[1m�[38;5;12m--> �[0m�[0msrc/tools/miri/src/helpers.rs:17:68�[0m
[01:34:35] �[0m   �[0m�[0m�[1m�[38;5;12m|�[0m
[01:34:35] �[0m�[1m�[38;5;12m17�[0m�[0m �[0m�[0m�[1m�[38;5;12m| �[0m�[0m            .find(|&&krate| this.tcx.original_crate_name(krate) == path[0])�[0m
[01:34:35] �[0m   �[0m�[0m�[1m�[38;5;12m| �[0m�[0m                                                                   �[0m�[0m�[1m�[38;5;9m^^^^^^^�[0m�[0m �[0m�[0m�[1m�[38;5;9mexpected struct `syntax::ast::Name`, found &str�[0m
[01:34:35] �[0m   �[0m�[0m�[1m�[38;5;12m|�[0m
[01:34:35] �[0m   �[0m�[0m�[1m�[38;5;12m= �[0m�[0m�[1mnote�[0m�[0m: expected type `�[0m�[0m�[1msyntax::ast::Name�[0m�[0m`�[0m
[01:34:35] �[0m              found type `�[0m�[0m�[1m&str�[0m�[0m`�[0m
[01:34:35] 
[01:34:35] �[0m�[1m�[38;5;9merror[E0308]�[0m�[0m�[1m: mismatched types�[0m
[01:34:35] �[0m  �[0m�[0m�[1m�[38;5;12m--> �[0m�[0msrc/tools/miri/src/helpers.rs:28:47�[0m
[01:34:35] �[0m   �[0m�[0m�[1m�[38;5;12m|�[0m
[01:34:35] �[0m�[1m�[38;5;12m28�[0m�[0m �[0m�[0m�[1m�[38;5;12m| �[0m�[0m                        if item.ident.name == *segment {�[0m
[01:34:35] �[0m   �[0m�[0m�[1m�[38;5;12m| �[0m�[0m                                              �[0m�[0m�[1m�[38;5;9m^^^^^^^^�[0m�[0m �[0m�[0m�[1m�[38;5;9mexpected struct `syntax::ast::Name`, found &str�[0m
[01:34:35] �[0m   �[0m�[0m�[1m�[38;5;12m|�[0m
[01:34:35] �[0m   �[0m�[0m�[1m�[38;5;12m= �[0m�[0m�[1mnote�[0m�[0m: expected type `�[0m�[0m�[1msyntax::ast::Name�[0m�[0m`�[0m
[01:34:35] �[0m              found type `�[0m�[0m�[1m&str�[0m�[0m`�[0m
[01:34:35] 
[01:34:36] �[0m�[1m�[38;5;9merror�[0m�[0m�[1m: aborting due to 4 previous errors�[0m

@rust-highfive

This comment has been minimized.

Sign in to view
@bors
Copy link
Collaborator

bors commented May 13, 2019

💔 Test failed - checks-travis

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 13, 2019
@RalfJung
Copy link
Member Author

@bors r=oli-obk

@bors
Copy link
Collaborator

bors commented May 13, 2019

📌 Commit 43207ca has been approved by oli-obk

@bors
Copy link
Collaborator

bors commented May 13, 2019

🌲 The tree is currently closed for pull requests below priority 500, this pull request will be tested once the tree is reopened

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 13, 2019
@nnethercote
Copy link
Contributor

This comment may be helpful.

@RalfJung
Copy link
Member Author

I did this, does that seem reasonable?

@nnethercote
Copy link
Contributor

Looks fine to me!

Centril added a commit to Centril/rust that referenced this pull request May 14, 2019
@Centril
Rollup merge of rust-lang#60780 - RalfJung:miri, r=oli-obk
020111a 
fix Miri

This reverts rust-lang#60156, which turned out to be a dead end (see rust-lang#60469).

r? @oli-obk
@Centril Centril mentioned this pull request May 14, 2019
Merged
bors added a commit that referenced this pull request May 14, 2019
@bors
Auto merge of #60834 - Centril:rollup-fikyi9i, r=Centril
372be4f 
Rollup of 9 pull requests

Successful merges:

 - #60130 (Add implementations of last in terms of next_back on a bunch of DoubleEndedIterators)
 - #60443 (as_ptr returns a read-only pointer)
 - #60444 (forego caching for all participants in cycles, apart from root node)
 - #60719 (Allow subdirectories to be tested by x.py test)
 - #60780 (fix Miri)
 - #60788 (default to $ARCH-apple-macosx10.7.0 LLVM triple for darwin targets)
 - #60799 (Allow late-bound regions in existential types)
 - #60808 (Improve the "must use" lint for `Future`)
 - #60819 (submodules: update clippy from 3710ec5 to ad3269c)

Failed merges:

r? @ghost
@bors bors merged commit 43207ca into rust-lang:master May 14, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@oli-obk oli-obk

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@RalfJung @rust-highfive @oli-obk @bors @nnethercote